Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

br,tidb,lightning: remove 'fips' suffix on version #49655

Merged
merged 1 commit into from
Dec 25, 2023
Merged

br,tidb,lightning: remove 'fips' suffix on version #49655

merged 1 commit into from
Dec 25, 2023

Conversation

tiancaiamao
Copy link
Contributor

@tiancaiamao tiancaiamao commented Dec 21, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #49771

Problem Summary:

What changed and how does it work?

Now we maintain special branch https://github.com/pingcap/tidb/tree/feature/release-6.5-fips instead of release with the master

The version already padding the branch name, so we can remove this, otherwise we get 'release-6.5-fips-fips'

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
./bin/tidb-server -V
Release Version: v7.6.0-alpha-513-g8215479a68
  • No need to test
    • I checked and no code files have been changed.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 21, 2023
@tiprow tiprow
Copy link

tiprow bot commented Dec 21, 2023

Hi @tiancaiamao. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@codecov Codecov
Copy link

codecov bot commented Dec 21, 2023 •
edited
Loading

Codecov Report

Merging #49655 (8215479) into master (56bf775) will increase coverage by 0.4154%.
Report is 50 commits behind head on master.
The diff coverage is n/a.

Additional details and impacted files 
@@               Coverage Diff                @@
##             master     #49655        +/-   ##
================================================
+ Coverage   70.9792%   71.3946%   +0.4153%     
================================================
  Files          1368       1428        +60     
  Lines        398687     424861     +26174     
================================================
+ Hits         282985     303328     +20343     
- Misses        95933     102597      +6664     
+ Partials      19769      18936       -833
Flag Coverage Δ
integration 44.5939% <ø> (?)
unit 70.9792% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9663% <ø> (ø)
parser ∅ <ø> (∅)
br 46.4138% <ø> (-6.4626%) ⬇️

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 21, 2023
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 21, 2023
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 21, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-21 06:22:07.871670677 +0000 UTC m=+1114818.908897590: ☑️ agreed by lance6716.
  • 2023-12-21 06:22:25.168941809 +0000 UTC m=+1114836.206168747: ☑️ agreed by hawkingrei.

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 25, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BornChanger, hawkingrei, lance6716, overvenus

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tiancaiamao
Copy link
Contributor Author

/merge

@tiancaiamao tiancaiamao reopened this Dec 25, 2023
@ti-chi-bot ti-chi-bot bot merged commit d844553 into pingcap:master Dec 25, 2023
30 of 38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BornChanger BornChanger BornChanger approved these changes

@hawkingrei hawkingrei hawkingrei approved these changes

@overvenus overvenus overvenus approved these changes

@lance6716 lance6716 lance6716 approved these changes

Assignees
No one assigned
Labels
approved lgtm release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

remove 'fips' suffix on version
5 participants
@tiancaiamao @lance6716 @overvenus @hawkingrei @BornChanger